Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for CMEK in alloydb cluster and automated backup #7781

Merged
merged 49 commits into from
Apr 26, 2023
Merged

Added support for CMEK in alloydb cluster and automated backup #7781

merged 49 commits into from
Apr 26, 2023

Conversation

ravisiddhu
Copy link
Contributor

@ravisiddhu ravisiddhu commented Apr 20, 2023 •
edited by SarahFrench
Loading

Added support for CMEK in alloydb cluster and automated backup.

CMEK is immutable for cluster but it is updatable for automated backup.

This is one of the 2 PR is to fix hashicorp/terraform-provider-google#13250

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Generated Terraform providers, and ran make test and make lint in the generated providers to ensure it passes unit and linter tests.
  • Ran relevant acceptance tests using my own Google Cloud project and credentials (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read the Release Notes Guide before writing my release note below.
alloydb: added `encryption_config` and `encryption_info` fields in `google_alloydb_cluster`, to allow CMEK encryption of the cluster's data.

alloydb: added the `encryption_config` field inside the `automated_backup_policy` block in`google_alloydb_cluster`, to allow CMEK encryption of automated backups.

ravisiddhu and others added 30 commits December 5, 2022 17:44
@ravisiddhu
Merge pull request #1 from GoogleCloudPlatform/main
5a168b6 
Sync Forked Repo
@ravisiddhu
Added validation for "type" in cloud_sql_user_resource for preventing…
98f5908 
… user from setting "password" or "host" for CLOUD_IAM_USER and CLOUD_IAM_SERVICE_ACCOUNT user types.
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
3061b1d
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
d11bed2
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
8048bf8
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
58019ac
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
a485a52
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
02591f4
@ravisiddhu
Removed validation and added documentation to prevent setting of host…
e4c2489 
… or password field for CLOUD_IAM_USER and CLOUD_IAM_SERVICE_ACCOUNT
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
cfae3b9
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
dfd9ff9
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
ff4a378
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
75e9296
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
6cf178e
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
1ee0fc9
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
5019e13
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
91ab93b
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
937e05b
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
0f1f118
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
fa46861
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
9112cc7
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
d2d5617
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
bd8c2a5
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
7ad591d
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
c155e13
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
f5e7885
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
14f5297
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
e8aa075
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
1c9cbfe
@ravisiddhu
Merge branch 'GoogleCloudPlatform:main' into main
ad136ed
@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2649
Passed tests 2365
Skipped tests: 277
Affected tests: 7

Action taken

Found 7 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccFirebaserulesRelease_BasicRelease|TestAccAlloydbBackup_missingLocation|TestAccAlloydbCluster_missingLocation|TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample|TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example|TestAccDataSourceAlloydbLocations_basic|TestAccDataSourceGoogleFirebaseAndroidAppConfig

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[Debug log]
TestAccAlloydbBackup_missingLocation[Debug log]
TestAccAlloydbCluster_missingLocation[Debug log]
TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample[Debug log]
TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example[Debug log]
TestAccDataSourceAlloydbLocations_basic[Debug log]

Tests failed during RECORDING mode:
TestAccDataSourceGoogleFirebaseAndroidAppConfig[Error message] [Debug log]

Please fix these to complete your PR
View the build log or the debug log for each test

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 504 insertions(+))
Terraform Beta: Diff ( 3 files changed, 504 insertions(+))
TF Conversion: Diff ( 3 files changed, 62 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2669
Passed tests 2378
Skipped tests: 280
Affected tests: 11

Action taken

Found 11 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccDataSourceGoogleFirebaseAndroidAppConfig|TestAccFirebaserulesRelease_BasicRelease|TestAccComputeNetworkFirewallPolicyRule_GlobalHandWritten|TestAccDataSourceAlloydbLocations_basic|TestAccComputeRegionNetworkFirewallPolicyRule_RegionalHandWritten|TestAccComputeFirewallPolicyRule_update|TestAccComputeFirewallPolicyRule_multipleRules|TestAccAlloydbBackup_missingLocation|TestAccAlloydbCluster_missingLocation|TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample|TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccDataSourceGoogleFirebaseAndroidAppConfig[Debug log]
TestAccFirebaserulesRelease_BasicRelease[Debug log]
TestAccComputeNetworkFirewallPolicyRule_GlobalHandWritten[Debug log]
TestAccDataSourceAlloydbLocations_basic[Debug log]
TestAccComputeRegionNetworkFirewallPolicyRule_RegionalHandWritten[Debug log]
TestAccComputeFirewallPolicyRule_update[Debug log]
TestAccComputeFirewallPolicyRule_multipleRules[Debug log]
TestAccAlloydbBackup_missingLocation[Debug log]
TestAccAlloydbCluster_missingLocation[Debug log]

Tests failed during RECORDING mode:
TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample[Error message] [Debug log]
TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example[Error message] [Debug log]

Please fix these to complete your PR
View the build log or the debug log for each test

SarahFrench
SarahFrench reviewed Apr 25, 2023
View reviewed changes
Copy link
Collaborator

@SarahFrench SarahFrench left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ravisiddhu, thanks for your contribution. I've just been taking a look and it seems that the changes you made to automatedBackupPolicy in this commit have been lost. Could you re-add that change to your PR please?

@ravisiddhu
Copy link
Contributor Author

Hi @ravisiddhu, thanks for your contribution. I've just been taking a look and it seems that the changes you made to automatedBackupPolicy in this commit have been lost. Could you re-add that change to your PR please?

I have re-added that change.

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 504 insertions(+))
Terraform Beta: Diff ( 3 files changed, 504 insertions(+))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2678
Passed tests 2394
Skipped tests: 278
Affected tests: 6

Action taken

Found 6 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccAlloydbBackup_missingLocation|TestAccAlloydbCluster_missingLocation|TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example|TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample|TestAccDataSourceGoogleFirebaseAndroidAppConfig|TestAccDataSourceAlloydbLocations_basic

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccAlloydbBackup_missingLocation[Debug log]
TestAccAlloydbCluster_missingLocation[Debug log]
TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example[Debug log]
TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample[Debug log]
TestAccDataSourceGoogleFirebaseAndroidAppConfig[Debug log]
TestAccDataSourceAlloydbLocations_basic[Debug log]

All tests passed
View the build log or the debug log for each test

@SarahFrench SarahFrench merged commit fe055be into GoogleCloudPlatform:main Apr 26, 2023
This was referenced Apr 26, 2023
Merged
Merged
Merged
maphad pushed a commit to maphad/magic-modules that referenced this pull request Apr 27, 2023
@ravisiddhu
Added support for CMEK in alloydb cluster and automated backup (Googl…
8a77bff 
…eCloudPlatform#7781)

* Added validation for "type" in cloud_sql_user_resource for preventing user from setting "password" or "host" for CLOUD_IAM_USER and CLOUD_IAM_SERVICE_ACCOUNT user types.

* Removed validation and added documentation to prevent setting of host or password field for CLOUD_IAM_USER and CLOUD_IAM_SERVICE_ACCOUNT

* Added support for CMEK in alloydb cluster and automated backup.
maphad pushed a commit to maphad/magic-modules that referenced this pull request Apr 27, 2023
@ravisiddhu
Added support for CMEK in alloydb cluster and automated backup (Googl…
8454854 
…eCloudPlatform#7781)

* Added validation for "type" in cloud_sql_user_resource for preventing user from setting "password" or "host" for CLOUD_IAM_USER and CLOUD_IAM_SERVICE_ACCOUNT user types.

* Removed validation and added documentation to prevent setting of host or password field for CLOUD_IAM_USER and CLOUD_IAM_SERVICE_ACCOUNT

* Added support for CMEK in alloydb cluster and automated backup.
maphad pushed a commit to maphad/magic-modules that referenced this pull request Apr 27, 2023
@ravisiddhu
Added support for CMEK in alloydb cluster and automated backup (Googl…
3e36b85 
…eCloudPlatform#7781)

* Added validation for "type" in cloud_sql_user_resource for preventing user from setting "password" or "host" for CLOUD_IAM_USER and CLOUD_IAM_SERVICE_ACCOUNT user types.

* Removed validation and added documentation to prevent setting of host or password field for CLOUD_IAM_USER and CLOUD_IAM_SERVICE_ACCOUNT

* Added support for CMEK in alloydb cluster and automated backup.
ericayyliu pushed a commit to ericayyliu/magic-modules that referenced this pull request Jul 26, 2023
@ravisiddhu @ericayyliu
Added support for CMEK in alloydb cluster and automated backup (Googl…
6f7e743 
…eCloudPlatform#7781)

* Added validation for "type" in cloud_sql_user_resource for preventing user from setting "password" or "host" for CLOUD_IAM_USER and CLOUD_IAM_SERVICE_ACCOUNT user types.

* Removed validation and added documentation to prevent setting of host or password field for CLOUD_IAM_USER and CLOUD_IAM_SERVICE_ACCOUNT

* Added support for CMEK in alloydb cluster and automated backup.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SarahFrench SarahFrench SarahFrench approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add CMEK option for alloyDB
3 participants
@ravisiddhu @modular-magician @SarahFrench